Merge "Fix for Bug 2290."