FLUID-5542: Updated comments