Bug/dcb 96/pebbles/master