Has there been update on this? I am facing a similar issue.