fixed problems with export
Merge remote-tracking branch 'origin/feature/CDB-596' into release/2.4.0