Merge: Propagate changes for issues #13053 and #13086 from 2.7 to 3.2.
(Doc only.)