Additional capabilities for admin.
Merge commit '646090ea21ae20edc43217775270967800077a5d'