2 Months Ago
Merge from market_terminal_power_fix