FLUID-5169: Fix updated to include testcase and fix for FLUID-5169