There was a lot of miscommunication and not reading comments etc. on the last security fixes. I forgot to add the keyword for the backports. I did write it on the report and also added a diff. But these were just ignored. Hopefully, we do better next time.

To fix 21.11 I added three patches now on 31908. They are meant only for 21.11. Note that 21.05 is NOT a target for backporting here.