wip/ar7/patches
