Update multi-tenant branch with latest from master