Bug/dcb 147/pebbles/master