Merged doc update from 3.3.