Commit represents the manual merge of !449 Rel-18 CR 28.623 YANG Corrections ; due to merge conflicts and rebase failure