1902: Some modifications to allow cargo verification to work r=CreepySkeleton a=pksunkara



Co-authored-by: Pavan Kumar Sunkara <[email protected]>