FLUID 5023 -  Fix and test case for defaults corruption through use of dynamic grades

Thanks for the report and test case, michelled and anastasiac!