Merge branch 'hotfix/work_dir'

* hotfix/work_dir:
  revert last commit
staging db changed
Merge branch 'hotfix/new_db' into develop

* hotfix/new_db:
  staging db changed