Merge doc change from 3.2.