Merge "Add a new hook AfterBuildFeedLinks to manipulate feed links"