Merge branch 'main' into 2226-segmentation-fault-in-isar-pre-renderer