Persisting comma separated lists as well now.
Merge branch 'develop'