Merge "Adds more roles to the protectionlevel" into tm-dev