merge for issue #20778