Apply patch (6/26)

Apply patch