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