Merge "Fix bug 2513041"