Merge branch 'release/0.0.8'
some more admin optimizations
Merge branch 'master' into develop