Merge "Fix typo in comment" into lmp-dev