GO ID upgrade #940