Merge branch...

Merge branch 'Rel20_CR_TS_28.623_Correct_several_issues_for_the_IOCs_related_to_MADCOL' into 'Integration_Rel20_SA5_163_YAML'

Rel20_CR0576_TS_28.623_Correct_several_issues_for_the_IOCs_related_to_MADCOL

See merge request !1916