[MERGE] forward port of branch saas-5 up to 73d39a0