Merge branch 'master' into FLUID-4907
Merge remote-tracking branch 'justin/FLUID-4907' into FLUID-4907
FLUID-4907: updated demo and builder to the new grade names.
Merge remote-tracking branch 'yura/FLUID-4907' into FLUID-4907