Merge branch 'master' into dummy-provider