Merge "Fix a typo" into mnc-dev