Start provider rewrite
Merge branch 'master' into dev-provider-rewrite
Fix apparent remaining provider rewrite issues