Merge doc changes from 3.2 (#10454, #12298)