wip/arista/patches
