Previous commit 81ea35c726 in main for 7.0 should have been applied in 6.2.x first for 6.2.1. This commit applies the changes in 6.2.x as intended, effective as of 6.2.13. Closes gh-33974
81ea35c726