Fixing sql bug
Merge remote branch 'origin/release' into lightweight_queue