Merge branch 'hotfix/remove_users'

* hotfix/remove_users:
  remove users
Merge branch 'release/1.6.1'

* release/1.6.1:
fix make_up
Merge branch 'hotfix/fix_make_up2' into develop

* hotfix/fix_make_up2:
  fix make_up