Merge changes from topic "am-27f04ae7e0ae44e5b4a558f8260d1fec" into main

* changes:
  [automerger skipped] Merge "[res] Move the latin parents map to be first" into main am: 25d1dfbe -s ours am: 9fe1784c -s ours
  [automerger skipped] [res] Move the latin parents map to be first am: cbc0f97e -s ours am: b05e9a21 -s ours