Fix: sql syntax error
Merge remote-tracking branch 'origin/3.6' into develop