Merge pull request #3057 from agh1/counties-as-extensions