Should I have committed the render fix to 6.1.x as well?

Same thing as #1969 but this time to 6.1.X