Merge branch 'main' into ericsson/sns-msvq-48kbps-basop-opt-quant