Merge "Fix for Bug 2396"