Don't update Controller.AvailableServers in server mode
Merge branch 'backend' into UI