Merge "Resolution for Bug 3957"