Bug/smoketest/pebbles/master