Merge "Prepare setup_clients and resource_setup"