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

f3680ec Update changelog
4ae39fc Fix failing tests

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