Issue #3410552: Fix tests and remove deprecations

Closes #3410552

Merge request reports

Loading