Merge "Update synonyms and fix some issues related to them" into lmp-mr1-dev