@cgmonroe's fix

(cherry picked from commit 490836d5de2cc911a581058d6b76ad8fe5d243de)

Closes #3592109

Merge request reports

Loading