412.08 merge dev branch (425.01) - Updated controller.c/.h