Merge branch 'update-autolinker' into 'develop'