Update plugins to match upstream patch