Automatic merge from submit-queue Replace client with clientset Replace client with clientset in some places Fixes: #34637