wip/vba-m/patches
