Merge for issue #26114