backport serverStatus refactoring #591

closes #591