Automatic merge from submit-queue (batch tested with PRs 37701, 36702, 37145, 37424, 38261)

function name change

function name change