Merge branch 'jk/alt-odb-cleanup'