issue fixed
Merge branch 'master' into barcode_changes