add admin functions
Merge branch 'release/1.7'

* release/1.7:
  add admin functions
Merge branch 'release/1.7' into develop

* release/1.7:
  add admin functions
Merge branch 'develop'

* develop: