Merge "New hook: OpportunisticLinksUpdate"