Forward port of branch saas-3 up to 7bcefaf