[MERGE] forward port of branch saas-4 up to f68c835