7 Commits (idb-fix)