Fixes external link issues
Merge branch 'fix/external-links' into develop

* fix/external-links:
  Fixes external link issues