[577620] Avoid deprecations
13 files changed