Merge dev upstream changes into improve/metadata

Branch has been created from main, but merges should always happen via dev branch, so before !36 (merged) we should bring changes from dev into the new branch.

assigned to @m.hock

merged