Issue #28987: Merge doc and comment fixes from 3.6