feat: #3567905 Fix failing tests

Closes #3567905

Merge request reports

Loading