Issue #156 (second draft)
Merge remote-tracking branch 'origin/csv_metadata_export_04'