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