FLUID-4599: Detabbed