Merge branch 'docs/attachment_links' into 'develop'