Fixes #159
Merge branch 'fixes/core' into develop