Merge branch 'jk/alt-odb-cleanup' into jk/quote-env-path-list-component