Merge branch 'main' into get-rid-of-render-handler