solve 1176_Planning_Rolling_Blackouts
Merge branch 'feature-1176'