Merge "Add "modeled" power components"