FLUID-4907: Modified the auxiliary builder to simplify the expander function and improve the output schema.
Merge remote-tracking branch 'justin/FLUID-4907' into FLUID-4907