Merge branch 'hotfix-1.8.6'
Added redirect module
Merge branch 'hotfix-1.8.7' into develop