Merged documentation update from 3.2.