GDP perf optimizations (#6553)