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