FLUID-5054: Registration of grades derived from dynamic grades
FLUID-5054: Removed redundant code from grade resolution following review
Merge remote-tracking branch 'amb26/FLUID-5054'

* amb26/FLUID-5054:
  FLUID-5054: Removed redundant code from grade resolution following review
  FLUID-5054: Registration of grades derived from dynamic grades