Merge branch 'main' into 454-dirac-cleanup