LPS-47632 Fix not being able to be redirected to another page, partial revert of LPS-47149 source formatting
LPS-47632 IN DEV