Resolve #3093198 "Replace all deprecated"

Oluwafemi Sosamirequested to merge
issue/diff-3093198:3093198-replace-all-deprecated into 8.x-1.x

Closes #3093198

Merge request reports