FLUID-5032, FLUID-5033: Support for forward reference in grades and dynamic grade reloading