FLUID-5362: some sentence restructuring