Merge branch 'rt/string-list-lookup-cleanup'