consumer_mapping changed since this branch was last worked on.