Merge branch 'release/18'
make querystring settable