I'm sorry if my messaging has not been as clear as it should be. I suggest the following:
- Take out the new commit with delays from this MR. Get it merged with just redetect support.
- Make another MR to add delays and selected parts of !306 (closed). You submitted !318 and that was okay in principle, except everything was squashed into one commit so it looked like a replacement for this MR rather than a follow-up addition.
The new commit expands both scope and size of this MR, so it requires more review work to happen first, and I'd rather get the changes into master first that you've already polished in the last couple of days.