Merge "Doc fixes" into mnc-ub-dev