Merge branch 'hotfix/sw-without-file'
sed switch for Darwin
Merge branch 'hotfix/osx-sed' into develop