Merged documentation addition from 3.2.