FedEx Handling Fee Doubled at Checkout/Payment.aspx

[dave@givemore.com]

We are using VERSION: 7.0 BUILD: 8839.

We are having an issue with the FedEx handling fee option getting doubled on the Checkout/Payment.aspx page.

(handling fee option is located at Configure > Shipping > Methods > FedEx 2 Day > Handling Fee)

This issue occurs for both a Fixed amount and Percentage based Handling Fee.

Percentage Example:
FedEx 2 day shipping option with 20% handling fee added.
- Base FedEx Price: $7.54 (without 20% handling fee)
- Price shown at Checkout/Shipping.aspx: $9.05 (20% handling fee added correctly here)
- Price shown at Checkout/Payment.aspx: $13.03 (20% handling fee applied twice to the already adjusted price)

Fixed Amount Example:
FedEx 2 day shipping option with $5 fixed handling fee added.
- Base FedEx Price: $7.54 (without $5 handling fee)
- Price shown at Checkout/Shipping.aspx: $12.54 ($5 handling fee added correctly here)
- Price shown at Checkout/Payment.aspx: $22.54 ($5 handling fee applied twice to the already adjusted price)

This issue occurs randomly (but often) and could be an internal only issue (We have some custom code that shows options such as the shipping estimator only to our internal ip address.)

Can someone please help?