Merge branch 'hotfix/staging_database'

* hotfix/staging_database:
  staging user changed
revert last commit
Merge branch 'hotfix/work_dir' into develop

* hotfix/work_dir:
  revert last commit