[skip-name-check][non-BE][renderer-non-BE][allow-regression][split-non-BE]Update main-pc with main - Part 3 See merge request !1670