Merge "Add producerId so we know when the BBQ producer has been changed."