Merge branch 'cherry-pick-c04796fd' into 'rel15'

Cherry pick c04796fd

See merge request 3GPP/SA3LI!5