Merge remote-tracking branch 'origin/main' into 156-refactor-dirac-rendering