Closes #16378: Merged docstring changes from 3.3.