Merge for issue #28605