Rather than opening the MR directly on upstream, I opened a new one from my fork. Should be ready for merge if Tobias and Johannes are good with it. That should conclude my performance work for the next release.