PLAT-4705 - Move RemoteServer