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