Applied doc fixes by Felix Li (RT #90211)