[420821] Avoid loading irrelevant plugins 
7 files changed