Merge "Fix bug 2963261"