Merge gcatpix into WIP