Merged in multi-server-hack