Merge: from benchmark_demo_clean - Clean: removal of dead functionality for demo benchmarks (not supporting it) Tests: compiled in editor