FLUID-5276: Separate containers for Fluid star and rest of component