[MERGE] Forward-port of saas-3 up to 141e1b2