s/dir/path/
Merge branch 'hotfix/1.4.0'