1.21.2-3 port

[nick9509]

to fill the gap between 1.21.1 and 1.21.4

[Harveykang]

I don’t want to fall behind on my studies, so I’ll probably have to wait until winter break to work on this.