[MERGE] [#196881] Fix merge redirection when remembered location used

[Alexander Belchenko]

John, I'm already took a blank sheet of A4 paper in the morning and wrote 100 times:
"I'm a very stupid man".

I can write this one more 100 times if you want.