Merge branch 'ek/alt-odb-entry-fix' into next