Merge branch 'sb/string-list'