Merge branch 'split-out-linking-code'