Squashed 'core/' changes from 67ddd20..f3680ec

f3680ec Update changelog
4ae39fc Fix failing tests

git-subtree-dir: core
git-subtree-split: f3680ecd0a34c95b6303eda6c07e4aa81b40c1be
Merge commit 'dcaf0108baa964e3f1212fa7002ccac98504461a' into develop