Hi Catalin,
Thank you very much for the feedback.
We implemented the workaround you described above and we got the desired results.
This looks like the solution for now. We will continue testing, but it looks to be working without any issues.
Regards,
Matt