Merge "[Fix Potential for error]:" into mnc-dev