Merge "Fixing docs." into mnc-dev