removed trailing whitespaces CDB-2784
changed the way data is fetch on sql query CDB-2784
Merge remote-tracking branch 'origin/master' into CDB-2784
Merge branch 'CDB-2784' into release/2.13.3