Merge "Fix hbd segfault for prune_one and prune_two" into nextgenv2