Merge remote-tracking branch 'pebble/develop' into develop

latest commit a8974246eb
@salimhb salimhb authored