Merge branch 'feat/1746-redirects' into develop