Merge "Use batch inserts for watchlist"