GPII-135: updated to the latest infusion

Updated to the latest infusion from master