Check in of server threading mods from old repo