FLUID-4907: Completed auxiliary builder and its unit tests.