Merge for issue #25099