Merge "Fix for bug 6050753."