Merge "Prepare setup_credentials as stable"