Merge branches 'basop-2457' and 'main' of...

Merge branches 'basop-2457' and 'main' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into basop-2457