Merge "Deprecate system server power re-attribution" into main