Merge "support haptic"