Ensure the Query Tool's maximum column length setting is honoured.
Merge remote branch 'origin/master' into debugger_redesign