Changes from 4.2 GearKernel