Merge branch 'main' into ericsson/fdcng-vq-rom-optimization