Sync to https://github.com/q-gears/q-gears/commit/404bad4c0b9954785870c85d268fab8fa56a00aa