Merge "Fixes in power benchmarks" into main