Sync to zerotacg/q-gears master