Merge branch 'auto-linker'