I'm facing the exact same issue here, any updates on this?