wip/xbsql/patches
