removed bug in sql query
Merge remote-tracking branch 'origin/development_rel_2_7_1' into development_rel_2_7_1