Merge branch 'hotfix/checkRedirect' into develop
Refactoring
Merge branch 'release/1.5.7'