Merge branch 'main' into basop-2436-isar-do-not-reuse-cldfb-handles