Attempt to fix this issue and add a smoke test.

Related to #3607931

Merge request reports

Loading