Merge branch 'jh/string-list-micro-optim'