Merge "Restoring bin/client in the scripts"