Applied patch from rt #35669