Merge for issue #27712