Merge "Re-add a string which was accidently removed." into mnc-dev