Updated from GMP 1.906.7