Merge fix for Bug#8879 from trunk