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