Issue #15657: Merge other doc fix from 3.5