feat: #3581619 Fix failed tests

Closes #3581619

Merge request reports

Loading