Apply patch (8/26)

Apply patch