Did you find a fix for this issue? I have the exact same requirement and I too am facing the same issue 😕