We are facing the same issue, did you manage to solve it? @Matt_Quinn