merge for issue #18755