Apply patch (16/26)

Apply patch