Merge branch 'fix/update-types-in-link-formatter' into 'develop'