Merge master into permission branch
Those should include the changes that we have from the master - and that we want to have in the permission management branch as well.
Those should include the changes that we have from the master - and that we want to have in the permission management branch as well.