chore: #3560486 fix 8.4 deprecations

Closes #3560486

Merge request reports

Loading