Merge "Revert "Add power properties""