Merge pull request #4243 from Black09/directoryprovider-extensions