Merge: from benchmark_fixes - fixes all-bar-one NREs happening when running `benchmark` command Tests: ran benchmark in editor