Was this ever resolved? Facing a similar issue.