MWPW-152672: bring latest from develop

[3ch023]

Fix https://github.com/adobecom/mas

Test URLs:

• Before: https://main--mas--adobecom.hlx.live
• After: https://setup--mas--adobecom.hlx.live

[aem-code-sync]

Hello, I'm the AEM Code Sync Bot and I will run some actions to deploy your branch and validate page speed.
In case there are problems, just click a checkbox below to rerun the respective action.

• Re-run PSI checks
• Re-sync branch

Commits

• e02d148 ✅ (latest)
• f712f43 ✅