Resolves WOLF-22