FLUID-5023: Fix and test case for defaults corruption through use of dynamic grades
Merge remote-tracking branch 'amb26/FLUID-5023'

* amb26/FLUID-5023:
  FLUID-5023: Fix and test case for defaults corruption through use of dynamic grades