New full commit

Sync with desktop