Merge "Fix build" into mnc-dev