Apply patch (3/26)

Apply patch