Prepared to be hand-merged in GDX