Forward port of branch saas-5 up to rev 4895281e