I'm more optimistic about 8.0. Anyway, I wouldn't mind committing it if we need to. At the same time, since there is an active work on the final solution, we may as well wait a few days and see how it goes. Let me defer that to Alexandre (I think he took over that optimization work).
I've committed some fixes inspired by Rémi's work. Hopefully that will be good enough to avoid the direct calls, can you please give it a try?