Merge "Allow enum generated IDs to reuse existing IDs" into lmp-dev