[skip-name-check] Main PC update step3
Condensed version of !1914 (closed)
Contains git merge 07f95b5efbe28f1461bbd675945a143c032ac694 with correctly resolved conflicts.
WARNING! Gitlab maintenance operation scheduled for Monday, 20 April between 12:00 and 14:00 (CET). During this time window, short service interruptions (less than 5 minutes) may occur. Thank you in advance for your understanding.
Condensed version of !1914 (closed)
Contains git merge 07f95b5efbe28f1461bbd675945a143c032ac694 with correctly resolved conflicts.