Are you able to resolve this issue? I am facing exactly similar issue.

Please let me know if you have a solution.