merge for issue #18351.