This is a follow-up to #36944, because I didn't manage to finish my review before the PR got merged. PR Close #37040