Merge "Fix for bug 2448479"