Merge "Spell out parameters" into mnc-dev