Apoptosis revisited

2 jobs for !286 with patch-1 in 1 minute and 2 seconds (queued for 1 second)
latest merge request