solved Bug 1033630

Request to review and merge solution for Bug 1033630.