Merge "Fix bug 2523989"