Checking for default components and adding them if they're missing
Merge branch 'master' into auth
Same thing for auth plugin