GetServerInfo intermediate commit
Fix conflicts