Optimized plugin triggers
Merge pull request #3911 from pjackson28/shortensometriggers

Optimized plugin triggers