Merge "Doc updates for MS6"