Merge branch 'main' into basop-2371-unused-isar-functions