Merge branch 'rs/fix-alt-odb-path-comparison'