Merge "Allow the same producer to gain a buffer twice."