Merge branch 'sb/string-list-remove-unused' into maint