I have posted an issue that was very similar to yours:
Unfortunately the diff you posted here has long since expired. I wonder if you could share any further detail of what did/didn’t work for you solving your issue?
Can you recommend any routes I could try to solve our issue?
