Merge "Fix documentation issue" into mnc-dev