Merge remote-tracking branch 'noamraph/master' into sync_send