Merged doc update from 3.2.