Merge branch 'auto_linker' into 'develop'