Merge branch 'main' into basop-2095-remove-unused-isar-tables