small internals tweak
Merge branch 'master' into feature/quoting