[MERGE] forward porting fixes from saas-3