Fixes: #3099 Role plugin moved to core