[PATCH 0/2] Backport unlink misfit patches into 6.1.y