FLUID-5205: Adding comments