Merge branch 'mh/alt-odb-string-list-cleanup'