Merge branch 'jp/string-list-api-cleanup'