Merge branch 'main' into ericsson/hq-envelope-stability-fix