Reapplied redirect validator fix to branch