Automatic merge from submit-queue (batch tested with PRs 39681, 39321, 41018, 40883) remove never used var