Fixes #4565  Add overrideLocation call in returning visitors, during further actions by same user
Merge remote-tracking branch 'origin/master'