Feature/dcb 80/pfs/betty/grizzly