Sync to upstream and add text to power=station and power=substation