Merge "fix typo in LocusId"