APD-513 Stop execution of controller method after redirect
Merge branch 'APD-513-BOZ' into develop