4.x
Merge pull request #18600 from TolyaTalamanov:at/implement-render-using-stateful
Merge pull request #20284 from TolyaTalamanov:at/wrap-render