wip/xspread/patches
