Merge "Fix bug 2520540"