Merge branch 'Integration_Rel18_SA5_161_YANG' into 'Rel-18'

From Integration_Rel18_SA5_161_YANG into Rel-18

See merge request !1780