Paired up with kiwimind → on this issue and can confirm it fixed the issue we were having. Marking as RTBC