Merge branch 'tz/redirect-fix' into maint