Merge "Preventing leak" into mnc-dev