Merge branch 'hotfix/fix-links-1st-paragraph'
Merge branch 'master' into dev