Patch from rt #35671