Any progress on this Shay? We're getting some weird behaviour with multiple shipping origin's where the cost of one origin raises the price above the threshold for free shipping on another origin which then gives free shipping for that origin's ship...