Issue 29274: Merge doc fixes from 3.5