Merge fix for issue #15111.