integrate with upstream gci