Merge branch 'jc/war-on-string-list'