[MERGE] Forward-port saas-3 up to fc92027