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