Backport to branch(3) : Remove deprecated API usages (Part 3)

[feeblefakie]

This is an automated request for a manual backport of the following:

• Original PR: Remove deprecated API usages (Part 3) #2974
• Commit to backport: 9f3a31b

1. Resolve any conflicts that occur during the cherry-picking process.

git fetch origin &&
git checkout 3-pull-2974 &&
git cherry-pick --no-rerere-autoupdate -m1 9f3a31b2c7bfb4dd98b8b307e5dbd6cfe4c0dc0e

2. Push the changes.
3. Merge this PR after all checks have passed.

Thank you!