fixed CDB-984
Merge remote-tracking branch 'origin/feature/CDB-363' into release/2.5.0