Added redirect module
Merge branch 'hotfix-1.8.7'