Applying GT fix to 1.7
Adding IC2 patches from master.