[skip-name-check][non-BE][rend-non-BE][allow-regression]Merge Main-pc into main

Intended mainly for CI code, as main-pc is already up-to-date with main.

Also includes fixes that came up while verifying:

• !1946 (merged) for issue #1831 (closed)
• !1943 (closed) for issue #1833 (closed)