FLUID-4907: Completed auxiliary builder and its unit tests.
Merge remote-tracking branch 'cindy/FLUID-4907' into FLUID-4907