Merge fix for Bug#4238 from trunk