Merge "Fix new[] vs delete mismatch." into mnc-dev