Backport go_api changes.