Fix deprecations

Closes #3456987

Merge request reports

Loading