Merge "Make LinksUpdate only wait on the DB with the link tables"