Merge branch 'jk/parseopt-string-list'