Merge branch 'refs/heads/release'
Merge branch 'refs/heads/release'
Hotfix: updated default error templates not to display exception stacks in production.
Freeze shift component versions
Merge branch 'refs/heads/master' into release