Merge "Fix spelling of a config variable." into mnc-dev