Merged in main servermon code.