GPII-76: That also includes framework updates from @amb26's FLUID-4330 branch.