#3565188: Fix failing builds

Closes #3565188

Merge request reports

Loading