Squashed 'core/' changes from 363110f..8c1118b

8c1118b Defer execution of task to let other tasks work

git-subtree-dir: core
git-subtree-split: 8c1118b22ac0957014c14293d27f3690db186290
Merge commit '265ff5249a2d84f69c8aa13769a6f1da5a7aaa60' into develop