Merge branch 'main' into 608-optimise-memory-allocation-in-fastconv-renderer