Merge branch 'tz/redirect-fix'