Merge for issue #25407