FLUID-5220: Updated Infusion

Includes conditional panels and improved performance of composite panels.
Merge remote-tracking branch 'jobara/FLUID-5220'

* jobara/FLUID-5220:
  FLUID-5220: Updated Infusion