Merge doc and comment fixes from 3.5