[MPS/ZH] [62257272] Improved ambiguous/duplicate match algorithm.