Unified blockingConsumeById(...) methods.
Merge branch 'master' into master-patched