Merge in default
Require default consumer for cancel nowait.
Merged bug25677 into default