merge for issue #18278