Merge remote branch 'smcv/ready/link-types'