Merge 3.5.0rc3 revisions back into current 3.5.0 head.