Merge pull request #23806 from arjantijms/6.2.5-BRANCH

Next version is 6.2.6-SNAPSHOT