Issue #3303953: Adjust deprecations

Adam G-H requested to merge issue/automatic_updates-3303953:3303953-adjust-deprecations into 8.x-2.x Aug 16, 2022