Backport #4742 to 6.4

[jamesagnew]

Backport the fix for #4742 to the 6.4 release branch

[codecov[bot]]

Codecov Report

:exclamation: No coverage uploaded for pull request base (rel_6_4@df8d2cd). Click here to learn what that means. Patch has no changes to coverable lines.

:exclamation: Current head e24e091 differs from pull request most recent head aadfbfe. Consider uploading reports for the commit aadfbfe to get more accurate results

Additional details and impacted files

@@            Coverage Diff             @@
##             rel_6_4    #4744   +/-   ##
==========================================
  Coverage           ?   81.30%           
  Complexity         ?    23920           
==========================================
  Files              ?     1437           
  Lines              ?    87777           
  Branches           ?    11823           
==========================================
  Hits               ?    71367           
  Misses             ?    11152           
  Partials           ?     5258           

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Do you have feedback about the report comment? Let us know in this issue.