Did you ever find a solution to this issue? We're running into the same scenario.

Thanks