Backport this fix for thrusters from Trunk Rev 10821