commit from gt2-master