Apply patch (7/26)

Apply patch