Merge for issue #26367