Merge "Fix for bug 2535."