APD-513: Add return after redirect to stop method execution
Merge branch 'APD-513-BOZ' into develop