SuperUser3.0

ROB-9428