Merge branch 'chore/bump-linkify' into 'develop'