Bug/dcb 65/betty/master