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

f3680ec Update changelog
4ae39fc Fix failing tests

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