Disabled plugins still causing performance impact

[loic (Loïc Guitaut)]

The PR has just been merged, it should be available in latest shortly