Merge branch...

Merge branch 'TS28.623_Rel-20_CR0707_TS_28.623_Correct_several_issues_for_the_IOCs_related_to_MADCOL' into 'Integration_Rel20_SA5_165_YAML'

TS28.623_Rel-20_CR0707_TS_28.623_Correct_several_issues_for_the_IOCs_related_to_MADCOL

See merge request !2024