Issue #2898903 by tetranz, alexpott, smustgrave, immaculatexavier,...

This is PR made to rebase 3206643-10.1 branch with the latest changes from drupal/10.1.x

I wasn't really sure how the whole workflow happens, but I read in the drupal slack channel that this branch was a few commits behind, so I thought I'll create a quick rebase for you. Didn't wanna mess up your work, that's why created a different branch.