Squashed 'core/' changes from cf60fa8..3771edd

3771edd Fix semantic versioning

git-subtree-dir: core
git-subtree-split: 3771edd53468396d4e9a22cc7dfe7608a5b14984
Merge commit '29679b701cf7dd61c5978323ec3dcda78c9b9be9' into develop