Merge branch 'hg/id-munging'