<<<<<<< HEAD ======= >>>>>>> feature/smart-supply-batches-qr-updates