TMSS-823: all commits come from bugs found while commissioning, have been fixed, deployed en tested.
Closes TMSS-823