Squashed 'core/' changes from 8230656..91d32f8

91d32f8 Splitting cleanup event

git-subtree-dir: core
git-subtree-split: 91d32f81553ab2afc65ba5b0f2344c7075c2b4ae
Merge commit '2fbce2f41b9f8c2257ace04de87ffb6e1ef78bcb' into feature/issue317-cleanup-events
Ignoring CleanupStart event in GUI