Merge branch 'main' into 1224-float-split-rendering-command-line-issues