[skip-name-check] [non-BE][split-non-BE][rend-non-BE][allow-regression] Main-pc update step4 - resolved version
This is the version resolved merge commit to bring main-pc up to latest main. Verification and discussion was in MR !1921 (closed). This also incorporates later changes that were separately tested in MR !1925 (closed) (minus temporary gitlab-ci changes)