Automatic merge from submit-queue (batch tested with PRs 36888, 38180, 38855, 38590) fix function notes