[MERGE] Forward-port saas-5 up to f9bcd67