RT#33790: Proper handling for aborting a suspend/cancel