Merging in ICE Payments fix