Support cancellation in push operation
Fix broken online push tests