Merge branch 'main' into ericsson/msvq-code-modularization-cleanup