jrouge/WFU-3484/Redirection_broken