Merge branch 'grok2' into v2.17.x