Add plugin keywords
Merge branch 'feature/keywords' into develop