Merge fix for issue #13547.