Merge "Adding server evacuate client"