Syncing up with infrastructure-p6 PR 884
drwxr-xr-x - client
drwxr-xr-x - server