Otherwise it's hard to see which its-base fixes are already in a plugin or not.
Relevant upstream changes are: