Merge fix for issue #11450