[HOTFIX] take back using barcode scanner
Merge branch 'master' into next