Merge branch 'hotfix/fix_admin2'

* hotfix/fix_admin2:
  fix controller
Merge branch 'release/1.7.3'

* release/1.7.3:
fixed
Merge branch 'hotfix/fix_events_update' into develop

* hotfix/fix_events_update:
  fixed