Resolves WOLF-49
Resolves WOlF-55