Bug/dcb 22/betty/master