Further improve zone detection and make login restoration more robust
And? Or? What's the difference\!