[MERGE] forward port of branch saas-3 up to 3d4b82c