Resolves WOLF-59