patch_avoca_v3