Merge branch 'master' into FLUID-4907
Merge remote-tracking branch 'justin/FLUID-4907' into FLUID-4907
FLUID-4907: added comments to primary builder.