Draft: Resolve #3510595 "Fix deprecation for"

Closes #3510595

Merge request reports

Loading