Changes from CloudPebble