Merge "Add generic links to app-to-web" into main