merge for issue #19963