21 Days Ago
Merge from market_terminal_power_fix