Merge "Update docs" into mnc-ub-dev