Fix deprecations

Closes #3616176

Merge request reports

Loading