wip/gstat/patches
