Squashed 'core/' changes from a66d5df..f78399e

f78399e Merge branch 'develop' into feature/daemon
f3680ec Update changelog
4ae39fc Fix failing tests
67ddd20 Fixing a few (not all) tests

git-subtree-dir: core
git-subtree-split: f78399ee2d7b3ca5933c1d178e69a733b910c24b
Merge commit '3bc85d726f9282a5767549ab112fb959f558d52d' into develop