FLUID-4907: updated infusion with some uio builder changes.