merge fix for issue #17953