FLUID-4824: Fix to template