[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. e7a0b1bb9095048914e11eb191...