Merge branch 'Permission-rewrite'
Merge branch 'master' of https://github.com/pinoniq/eagle