Admin Opacity
Merge branch 'dev'