Merge branch 'Integration_Rel17_SA5_153_YANG' into 'Rel-17'

Integration_Rel17_SA5_153_YANG into Rel-17

See merge request !1046