Merge branch 'feature/issue-41-fast-forward-non-model-data' into develop
Merge branch 'develop' into feature/issue-42-cleanup-file-layout