bug-fix: check if query return column exists
Merge remote branch 'origin/release' into qa