Issue #3580345: Fix CI test failures

Closes #3580345

Merge request reports

Loading