Merge "Fix WHEEL_TICK + and add friends"