Merge branch alfroch-add-metadata with refs/heads/master into refs/merge-requests/592/train

51 jobs for !592 with alfroch-add-metadata into master in 12 minutes and 18 seconds (queued for 4 seconds)
merge train