merge for issue #17357