TMSS-761: commissioning fixes and patches, we will continue commissioning in sprint 2021-8 in TMSS-823 Closes TMSS-761