Card #226 diagnostic @UserOnly, identifier @RoleOnly service security, test fixes