Merge outstanding Pull requests from Pebbles to Roxy