Merge branch 'metadata-fixes' into 'main'

Package metadata and other changes towards a public release

See merge request !3