Merge "Fix cancel flag check" into main