merge with last upstream doc changes in 3.2