Merge "Fix bug #2493102 (Sync keeps getting stuck, or at least very slow)"