Merge "First implementation of the grant/revoke UI"