Fix for login dialog when server is not running
Merge branch 'release_v3.9.0' into dev-loyola