Re-ordered links GCP-8484