Merge branch 'develop' into multi-barcode