054.03 controller changes cross-ported with 440.02 - testing pass