Update with updated upstream patch from base r249839