FLUID-5512: Improved commenting following review