Merge for issue #26271