[HOTFIX] take back using barcode scanner
Merge remote-tracking branch 'upstream/master'