[MERGE] forward port of branch saas-5 up to 9363bc9