[skip-name-check] Main PC update step3
Condensed version of !1914 (closed)
Contains git merge 07f95b5efbe28f1461bbd675945a143c032ac694
with correctly resolved conflicts.
Condensed version of !1914 (closed)
Contains git merge 07f95b5efbe28f1461bbd675945a143c032ac694
with correctly resolved conflicts.