Include both base links (registry and controller) (#434 note-6)