Merge "Fix minor corner cases in BufferHubQueueProducer" into oc-dev