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