revert last commit
Merge branch 'hotfix/work_dir'

* hotfix/work_dir:
  revert last commit