Merge pull request #17233 from alifrumin/rn5.25