Bug/vnc/pebbles/master