Merge "Fix PowerStatsTestsRavenwood" into main