Merge fix for issue #11391