Merge "Fix issue #18053"