Forward port of issue #13632 to 6.2.x.

Comment From: sjohnr

Closed via a29f90b29eb2ea08aefe81376c3310006705bdbb, duplicate of gh-13634