Automatic merge from submit-queue (batch tested with PRs 38695, 38507) Fix resource gatherer for kubemark Not working yet...