FLUID-5362: Edits based on review