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