Resolve MAC-1 "Stock barcode"

Merged Marco Folco requested to merge MAC-1-Stock_barcode into 11.0-stage

Closes MAC-1

Merge request reports