fixed CDB-2106 and CDB-2100 wrong parameters when fetching table data
Merge CDB-2106 into release/2.11.2