Merge fix for Bug#8870 from trunk