Bug/dcb 26/betty/master