We have currently an open incident of the same issue. This is incident INC0045741. Can we use that incident to resolve this issue that you also raised ka?
I have already added you in that incident so you will be able to also test the solution once we have it ready?