I think this has since been solved as the integration tests are passing for me.