Forward port of branch saas-3 up to 7bcefaf
Forward port of branch saas-4 up to rev 15a3a2a