Merge "Fix "with leading digits" display." into mnc-dev