Merge branch 'microsoft7_provider'