Merge pull request #13088 from KevinGG/release-2.25.0

[BEAM-11056] Fix warning message and rename old APIs (#13080)