Forward port of branch saas-3 up to rev 9f5e989