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