fixed CDB-1030 CDB-992
Merge remote-tracking branch 'origin/bug/CDB-992' into release/2.5.1