Merge branch 'cr/33128/0611' of forge.3gpp.org:sa3/li into cr/33128/0611