Fix ID conflicts.
Merge branch 'fixes/fix-ID-conflict-proposal-13112-rng'