Merge "Fix potential leak" into mnc-dev