task: #3618879 Fix failing tests

By: bluegeek9

Closes #3618879

Merge request reports

Loading