Merge branch 'joezsweet-multi-barcode' into develop