powerup alert
Merge branch 'zhandev'