Merge branch 'hotfix/manual-links'
Add 2.2 apidoc symlink
Merge branch 'hotfix/apidoc-links' into develop