Solved Bug 1065376

Request to review and merge solution for Bug 1065376.