[MERGE] Forward-port saas-4 up to 8b15482