Resolve "Update tools for better export handling"

Yakubov, Sergeyrequested to merge
105-update-tools-for-better-export-handling into dev

Closes #105 (closed)

Merge request reports