Merge commit '561aaedc0220db09d660c29d8237eb937373a7c1' * commit '561aaedc0220db09d660c29d8237eb937373a7c1': make sure that the sync thread is protected by a consistent lock
Merge commit '561aaedc0220db09d660c29d8237eb937373a7c1' * commit '561aaedc0220db09d660c29d8237eb937373a7c1': make sure that the sync thread is protected by a consistent lock