Merge "Partial fix for Bug 1256"