Bugfix
Merge branch 'release/six-files' into develop