Merged documentation update from 3.5.