Fixes #179
Merge branch 'refactoring/core' into develop