Handle "None" plugins
Merge remote branch 'origin/master'
minor work