R1.9

GD Modification against 1.9 version