MBS-7736: Update all medium positions on merge simultaneously, so as to not anger unique index gods.
Merge branch 'mbs-7736'

* mbs-7736:
  MBS-7736: Update all medium positions on merge simultaneously, so as to not anger unique index gods.
Merge branch 'master' into beta