Merge branch 'tf/string-list-init'