Feature/dcb 77/betty/grizzly