Merge branch 'improve-internal-links-in-html'