#1589595 improve synchronizing of history