[3.8] Plugins enhancements