Apply patch (2/26)

Apply patch