Fix redirect on reload controller.
Merge branch 'redirect' into allFixes