Merge branch 'main-pc-update-step4-revert-version-final' into 'main-pc'

Contains resolved result of the merge of 'origin/main' into 'main-pc'

[skip-name-check] [non-BE][split-non-BE][rend-non-BE][allow-regression] Main-pc update step4 - resolved version with revert included

See merge request !1932