Merge "renumber master enums to avoid mr1 collision"