FLUID-5220: Updated Infusion

Includes conditional panels and improved performance of composite panels.