Patch old redirect code into main file
Update comparison symbols
Delete v4.1.15's temporary file
Fix merge conflicts