Backport and begin fixing tests

Closes #3549134

Merge request reports

Loading
Loading