Merge branch 'main' into ericsson/change-fix730-to-nonbe