Merge branch 'jk/haves-from-alternate-odb' into next