This should only impact the Thorax implementation.

@jhudson8 I think we are clear to move this and the ASDA PR forward. Can you coordinate with @Candid on the best time to merge that into the ASDA project and pull in the new thorax tree?