FLUID-5484: Updated based on review feedback.