Temp fix for directory creation problem.
Merge branch 'develop'