Bug/dcb 124/pebbles/master