[MERGE] Forward-port saas-3 up to 09ab2d4