Merge fix for issue #12963.