Bug 1065376 solved

Request to review and merge solution for bug 1065376.