Merge: from triggerparentdelayedexit_optim - Bugfix: properly cleanup TriggerParent and TriggerParentDelayedExit to avoid invalid invokes running Tests: built & finished a boat, jumped around while moving, put it into edit, finished, jumped around - no errors, no extra invokes