[MERGE] Forward-port latest saas-3 bugfixes, up to 30f43da