Applying changes from our PR to Spree