Merge for issue #22191 fix