Add admin user distinction
Merge branch 'release/0.0.14'