Merge "Fix one compiler error found by mmm" into mnc-ub-dev