Adjustments to list name escaping.
Merge branch 'master' into pre-production