Draft: Issue #3530667 Remove code deprecated in 4.0.22

Closes #3530667

Merge request reports

Loading