Merge branch 'master' into dev

* master:
  enable invalidate
admin interface
Merge branch 'dev'

* dev:
  admin interface