Fix duplicate barcode on collection
Merge branch 'master' into production