Did you solve this issue ? I'm in similar situation.