Merge "Fix deadlock in BaseDataProducer." into tm-qpr-dev