GPII-127: Update Infusion to latest master