Merge for issue #25609