Merge branch 'issue-17' into 'develop-v2.1.1'

issue-17 changes: imports and metadata

See merge request !11
2 jobs for develop-v2.1.1
in 28 seconds, using 0 compute credits, and was queued for 5 seconds