Merge branch 'ew/update-server-info'