[Finishes 59297334, 58860712]: new links in header
merge