Merge "Add additional cancel logs." into sc-dev