Merge fix for issue #11501