#213 Improved cancellation handling at different stages