Merge "Fix a typo" into lmp-preview-dev