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