Apply patch (19/26)

Apply patch