Undo of Undo: 139927 (merge: from triggerparentdelayedexit_optim) Will apply the fixes on top with merge