Merge pull request #686 from LHCGreg/12971-IsRedirectedAfterSet