Intranet redirect
Merge branch 'hotfix'