Merge pull request #1765 from vincentbernat/fix/kafka-partition-selection