Resolves WOLF-62