Merge "Fix a typo in comment." into lmp-dev