Merge "Define 'links' as a common parameter type"