Added fix for Bug 11630