[MERGE] Foward-port saas-5 up to ee4df1e