[Git][ghc/ghc][wip/9.14.2-backports] 2 commits: UniqueDFM: alter should preserve insertion order