Bug/dcb 63/betty/master