Merge branch 'hv/link-alt-odb-entry'