Automatic merge from submit-queue (batch tested with PRs 35884, 37305, 37369, 37429, 35679) fix typo in predicates