Feature/svendk 181 279 282 265 155 244

And now i realized that i missed in in the other pull request.
Could we please just keep the permissions out of features?