Resolve #3507938 Fix failing unit tests

Closes #3507938

Merge request reports

Loading