Merge "Wait until the remote side has loaded everything before start copying." into nyc-andromeda-dev