Switch redirect when trap
Cleaning
Merge branch 'frequent-redirect-switching'