FLUID-5486: Updates based on review feedback.