Contains patches for 3.20