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