392.49 Intermediate commit for motor timeout work - DO NOT USE