Merged v1.63 changes to multi-server-hack