I'm still running into this issue myself, I haven't actually tested the D8 patches (the only D8 sites that I have are pretty simple, therefore this issue hasn't came up) but I did test out both of the current D7 patches but I ended up choosing #231 because it changed the least amount of code. I know that's not necessarily the best route or that just b/c it changed the least code it is the best but it was less convoluted considering the length of this thread and the problem that we were facing with what was getting filtered out in our views on a project that we are currently working on. The patch worked and fixed our current problem but we plan on re-visiting this issue soon to either contribute another patch if needed or at least pitch in to get this issue worked out. Thanks all who have worked on this thread, it is definitely a pain point at this time and hopefully all of the hard work will pay off soon. Also commenting to subscribe to future updates since I now have a vested interest in the work being done in this thread.