Checked up to: 7c5759b61785b2e499b181dbcbe69a3c63faab4d (Dec 24 2022)

Commits from upstream to go through:

utf8:
5b5bfa6ffcf656c9fcffc74d2d1c33201d27a74b
917914fcf0b80803656c973dec2766318d09d0f0
bddfb3be2c178f40b0d68fea33cd47090666409f
