Merge doc fixes from 3.6