Merge branch 'main' into joh/esbuild-the-things