Merge "Disambiguate between unique and original ids in MR2Provider" into main