Patches to apply to stable releases [6/3/2020]