merged upstream/master with new pebble endpoint into integration