Upgraded GA code, fixes #ORG-1990