Merge branch 'hotfix/readme-links' into develop