Merge branch 'dev' into 'testing'

bug fix for additional_metadata in timeseries

See merge request !148
3 jobs for testing in 1 minute and 21 seconds (queued for 1 second)