don't sync so often
merge bug26001 into junk