Add support to redirect to pages
Merge branch 'develop'