Apply patch (5/26)

Apply patch