FLUID-5378: Updated based on review