Any update on this? I'm facing exactly the same issue