Merge outstanding pull requests from Pebbles branch