#3286 - PoisonPill instead of Terminate + endpoint cleanup