Patches for 21.4.13