[1.6.x] Additional edits for refs #23340; thanks Loic.

Backport of 0a2bc6e6bd from master