23304_CR0451r3_(Rel-19)_5G_ProSe_Ph3_S2-2409537 23304_CR0450r2_(Rel-19)_5G_ProSe_Ph3_S2-2409398 The Clause numbering and crodss referencing were difficult to understand, I found later CRs which needed integrating and did what seemed best. --> Please check the whole set of new clauses and references to other clauses. ===================