Merge branch 'jc/string-list-cleanup' into maint