Merge doc fixes #14553 and #14552.