Merge branch 'update/linkify' into 'develop'