Merge branch 'feature/convert-slashes' into develop