Merge branch 'Integration_Rel18_SA5_161_YAML' into 'Rel-18'

Integration rel18 sa5 161 and 160 contents to release branch for all yaml

See merge request !1783