26887 Add shield and permissions