[ed29c4da21] Don't let BLOCKED state get converted into a channel error.
[ed29c4da21] Merge patch from 8.5, still not a complete fix.