Update gdc-4.7 branch

Merged everything up to e8cc79110321128ff97e46eb6441fa10ea27c8e7