I believe I have merged all the fixes people wanted to see in 1.18 and 1.20. Anyone who's interested please double-check that your fixes are in:

1.18:

1.20:

If everyone are happy with these, I will try to make some releases this weekend.

-- Johan