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