Merge "Fix bug 482543."