Merge branch 'update_auto_linker' into 'develop'