Merge "Fix the build" into mnc-dev