Merge "Fix warning" into mnc-dev