don't sync so often
Merge bgu26001