Resolve "Corrections to Export functionality"

Merged Piotr Gawron requested to merge 555-corrections-to-export-functionality into devel_12.1.x

Closes #555 (closed)

Merge request reports