#267: Correct field permissions for events key
Merge branch 'feature/late-night'
Merge branch 'master' into test