Merge branch 'main' into kiene/debugging-fix-high-id