Merge pull request #940 for adding access controls for encounter categories