#5297 Add cancel and waitForFeedback functionality