Fix
Logs sending
Merge