Resolve #3574859 "Remove deprecated code"

Closes #3574859

Merge request reports

Loading